Drop GtkFileChooserEmbed

This private interface is no longer used.

diff --git a/gtk/gtkfilechooserembed.c b/gtk/gtkfilechooserembed.c
deleted file mode 100644 (file)
index 24c171a..0000000
--- a/gtk/gtkfilechooserembed.c
+++ /dev/null
@@ -1,152 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtkfilechooserembed.h: Abstract sizing interface for file selector implementations
- * Copyright (C) 2004, Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "config.h"
-#include "gtkfilechooserembed.h"
-#include "gtkmarshalers.h"
-#include "gtkintl.h"
-
-static void gtk_file_chooser_embed_class_init (gpointer g_iface);
-static gboolean delegate_should_respond       (GtkFileChooserEmbed *chooser_embed);
-static void delegate_initial_focus            (GtkFileChooserEmbed *chooser_embed);
-static void delegate_response_requested       (GtkFileChooserEmbed *chooser_embed,
-                                              gpointer             data);
-
-static GtkFileChooserEmbed *
-get_delegate (GtkFileChooserEmbed *receiver)
-{
-  return g_object_get_data (G_OBJECT (receiver), "gtk-file-chooser-embed-delegate");
-}
-
-/**
- * _gtk_file_chooser_embed_delegate_iface_init:
- * @iface: a #GtkFileChoserEmbedIface structure
- * 
- * An interface-initialization function for use in cases where an object is
- * simply delegating the methods, signals of the #GtkFileChooserEmbed interface
- * to another object.  _gtk_file_chooser_embed_set_delegate() must be called on
- * each instance of the object so that the delegate object can be found.
- **/
-void
-_gtk_file_chooser_embed_delegate_iface_init (GtkFileChooserEmbedIface *iface)
-{
-  iface->should_respond = delegate_should_respond;
-  iface->initial_focus = delegate_initial_focus;
-}
-
-/**
- * _gtk_file_chooser_embed_set_delegate:
- * @receiver: a GOobject implementing #GtkFileChooserEmbed
- * @delegate: another GObject implementing #GtkFileChooserEmbed
- *
- * Establishes that calls on @receiver for #GtkFileChooser methods should be
- * delegated to @delegate, and that #GtkFileChooser signals emitted on @delegate
- * should be forwarded to @receiver. Must be used in conjunction with
- * _gtk_file_chooser_embed_delegate_iface_init().
- **/
-void
-_gtk_file_chooser_embed_set_delegate (GtkFileChooserEmbed *receiver,
-                                     GtkFileChooserEmbed *delegate)
-{
-  g_return_if_fail (GTK_IS_FILE_CHOOSER_EMBED (receiver));
-  g_return_if_fail (GTK_IS_FILE_CHOOSER_EMBED (delegate));
-  
-  g_object_set_data (G_OBJECT (receiver), I_("gtk-file-chooser-embed-delegate"), delegate);
-
-  g_signal_connect (delegate, "response-requested",
-                   G_CALLBACK (delegate_response_requested), receiver);
-}
-
-
-
-static gboolean
-delegate_should_respond (GtkFileChooserEmbed *chooser_embed)
-{
-  return _gtk_file_chooser_embed_should_respond (get_delegate (chooser_embed));
-}
-
-static void
-delegate_initial_focus (GtkFileChooserEmbed *chooser_embed)
-{
-  _gtk_file_chooser_embed_initial_focus (get_delegate (chooser_embed));
-}
-
-static void
-delegate_response_requested (GtkFileChooserEmbed *chooser_embed,
-                            gpointer             data)
-{
-  g_signal_emit_by_name (data, "response-requested");
-}
-
-
-/* publicly callable functions */
-
-GType
-_gtk_file_chooser_embed_get_type (void)
-{
-  static GType file_chooser_embed_type = 0;
-
-  if (!file_chooser_embed_type)
-    {
-      const GTypeInfo file_chooser_embed_info =
-      {
-       sizeof (GtkFileChooserEmbedIface),  /* class_size */
-       NULL,                          /* base_init */
-       NULL,                          /* base_finalize */
-       (GClassInitFunc)gtk_file_chooser_embed_class_init, /* class_init */
-      };
-
-      file_chooser_embed_type = g_type_register_static (G_TYPE_INTERFACE,
-                                                       I_("GtkFileChooserEmbed"),
-                                                       &file_chooser_embed_info, 0);
-
-      g_type_interface_add_prerequisite (file_chooser_embed_type, GTK_TYPE_WIDGET);
-    }
-
-  return file_chooser_embed_type;
-}
-
-static void
-gtk_file_chooser_embed_class_init (gpointer g_iface)
-{
-  GType iface_type = G_TYPE_FROM_INTERFACE (g_iface);
-
-  g_signal_new (I_("response-requested"),
-               iface_type,
-               G_SIGNAL_RUN_LAST,
-               G_STRUCT_OFFSET (GtkFileChooserEmbedIface, response_requested),
-               NULL, NULL,
-               NULL,
-               G_TYPE_NONE, 0);
-}
-
-gboolean
-_gtk_file_chooser_embed_should_respond (GtkFileChooserEmbed *chooser_embed)
-{
-  g_return_val_if_fail (GTK_IS_FILE_CHOOSER_EMBED (chooser_embed), FALSE);
-
-  return GTK_FILE_CHOOSER_EMBED_GET_IFACE (chooser_embed)->should_respond (chooser_embed);
-}
-
-void
-_gtk_file_chooser_embed_initial_focus (GtkFileChooserEmbed *chooser_embed)
-{
-  g_return_if_fail (GTK_IS_FILE_CHOOSER_EMBED (chooser_embed));
-
-  GTK_FILE_CHOOSER_EMBED_GET_IFACE (chooser_embed)->initial_focus (chooser_embed);
-}

diff --git a/gtk/gtkfilechooserembed.h b/gtk/gtkfilechooserembed.h
deleted file mode 100644 (file)
index 5a01319..0000000
--- a/gtk/gtkfilechooserembed.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtkfilechooserembed.h: Abstract sizing interface for file selector implementations
- * Copyright (C) 2004, Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __GTK_FILE_CHOOSER_EMBED_H__
-#define __GTK_FILE_CHOOSER_EMBED_H__
-
-#include <gtk/gtkwidget.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_FILE_CHOOSER_EMBED             (_gtk_file_chooser_embed_get_type ())
-#define GTK_FILE_CHOOSER_EMBED(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FILE_CHOOSER_EMBED, GtkFileChooserEmbed))
-#define GTK_IS_FILE_CHOOSER_EMBED(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_FILE_CHOOSER_EMBED))
-#define GTK_FILE_CHOOSER_EMBED_GET_IFACE(obj)   (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTK_TYPE_FILE_CHOOSER_EMBED, GtkFileChooserEmbedIface))
-
-typedef struct _GtkFileChooserEmbed      GtkFileChooserEmbed;
-typedef struct _GtkFileChooserEmbedIface GtkFileChooserEmbedIface;
-
-
-struct _GtkFileChooserEmbedIface
-{
-  GTypeInterface base_iface;
-
-  /* Methods
-   */
-  gboolean (*should_respond)      (GtkFileChooserEmbed *chooser_embed);
-
-  void (*initial_focus)           (GtkFileChooserEmbed *chooser_embed);
-  /* Signals
-   */
-  void (*response_requested)      (GtkFileChooserEmbed *chooser_embed);
-};
-
-GType _gtk_file_chooser_embed_get_type (void) G_GNUC_CONST;
-
-gboolean _gtk_file_chooser_embed_should_respond (GtkFileChooserEmbed *chooser_embed);
-
-void _gtk_file_chooser_embed_initial_focus (GtkFileChooserEmbed *chooser_embed);
-
-void _gtk_file_chooser_embed_delegate_iface_init  (GtkFileChooserEmbedIface *iface);
-void _gtk_file_chooser_embed_set_delegate         (GtkFileChooserEmbed *receiver,
-                                                  GtkFileChooserEmbed *delegate);
-
-G_END_DECLS
-
-#endif /* __GTK_FILE_CHOOSER_EMBED_H__ */

diff --git a/gtk/meson.build b/gtk/meson.build
index 96f626aef3caa42ca7e482d7c4b5fa0b41eaeff4..bb08e506a8fee783317c4b654352e9a30a9151f8 100644 (file)
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -100,7 +100,6 @@ gtk_private_sources = files([
   'gtkcssvalue.c',
   'gtkcsswidgetnode.c',
   'gtkdrop.c',
-  'gtkfilechooserembed.c',
   'gtkfilechooserentry.c',
   'gtkfilechoosererrorstack.c',
   'gtkfilechoosernativeportal.c',